merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 5 Sep 2012 01:26:02 +0000 (10:26 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 5 Sep 2012 01:26:02 +0000 (10:26 +0900)

Trivial merge